From: Florian Müllner <fmuellner@gnome.org>
Date: Wed, 19 Sep 2012 03:02:15 +0000 (+0200)
Subject: userMenu: Close menu immediately when activating Lock
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~5812
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=1f30670c1d8d8;p=gnome-shell.git

userMenu: Close menu immediately when activating Lock

When locking the screen, the user menu is moved to the opposite
side. Unless we close the menu immediately without animation, the
menu will jump to the other side and fade out while the screen
shield slides down.

https://bugzilla.gnome.org/show_bug.cgi?id=684343
---

diff --git a/js/ui/userMenu.js b/js/ui/userMenu.js
index fcac6cdb7..3d6e340fb 100644
--- a/js/ui/userMenu.js
+++ b/js/ui/userMenu.js
@@ -12,6 +12,7 @@ const Tp = imports.gi.TelepathyGLib;
 const UPowerGlib = imports.gi.UPowerGlib;
 const Atk = imports.gi.Atk;
 
+const BoxPointer = imports.ui.boxpointer;
 const GnomeSession = imports.misc.gnomeSession;
 const Main = imports.ui.main;
 const PanelMenu = imports.ui.panelMenu;
@@ -813,6 +814,7 @@ const UserMenuButton = new Lang.Class({
     },
 
     _onLockScreenActivate: function() {
+        this.menu.close(BoxPointer.PopupAnimation.NONE);
         Main.overview.hide();
         Main.screenShield.lock(true);
     },